Update Java grpc metadata for new staging structure #1265

shinfan · 2017-05-12T18:16:24Z

Make the build file depending on the local proto artifact instead of Maven.

codecov-io · 2017-05-12T18:24:33Z

Codecov Report

Merging #1265 into master will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #1265   +/-   ##
=========================================
  Coverage     86.41%   86.41%           
  Complexity     3812     3812           
=========================================
  Files           374      374           
  Lines         15173    15173           
  Branches       1696     1696           
=========================================
  Hits          13112    13112           
  Misses         1609     1609           
  Partials        452      452

Impacted Files	Coverage Δ	Complexity Δ
...tagen/java/JavaGrpcPackageMetadataTransformer.java	`100% <ø> (ø)`	`2 <0> (ø)`	⬇️
...agen/java/JavaProtoPackageMetadataTransformer.java	`100% <ø> (ø)`	`2 <0> (ø)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d69ff23...7184161. Read the comment docs.

michaelbausor · 2017-05-12T19:42:55Z

Is the intention that the updated build.gradle file in this PR is specifically for api-client-staging, and then we will also generate a second build.gradle file that can be used to release the package? Won't they both need to sit in the same location in api-client-staging?

shinfan · 2017-05-12T20:17:04Z

@michaelbausor Yes there will be both build.gradle sitting in the same location (the release one will be named as build_release.gradle) while during the releasing process we will need some extra steps to swap the staging build file and the release build file.

shinfan · 2017-05-12T23:35:47Z

@michaelbausor As discussed I have updated the PR to support both build files. I have also updated the api-client-staging PR as well googleapis/api-client-staging#297

...ain/java/com/google/api/codegen/grpcmetadatagen/java/JavaGrpcPackageMetadataTransformer.java

@@ -22,7 +22,8 @@
  private final Map<String, String> snippetsOutput =
      ImmutableMap.of(
          "LICENSE.snip", "LICENSE",
-          "metadatagen/java/grpc/package.snip", "build.gradle");
+          "metadatagen/java/grpc/package.snip", "build.gradle",


src/main/resources/com/google/api/codegen/metadatagen/java/grpc/package_staging.snip

+      $unhandledCase: {@metadata.generationLayer}$
+    @end
+  }
+@end


src/main/resources/com/google/api/codegen/metadatagen/java/grpc/package_staging.snip

@@ -0,0 +1,59 @@
+@snippet generate(metadata)


shinfan · 2017-05-19T17:36:20Z

@garrettjonesgoogle Sorry that I accidentally force pushed the PR so the history might get lost. PTAL

garrettjonesgoogle · 2017-05-19T17:42:30Z

LGTM

* Fix JSON pretty print in Ruby sample (#1254) * Ruby: README Overhaul (feat. examples) (#1245) * go: use new metadata methods (#1262) Updates googleapis/google-cloud-go#624. metadata.FromContext and metdata.NewContext are replaced by metadata.{New,From}{Incoming,Outgoing}Context. Generated unit tests now verify that x-goog-api-client header is inserted. Additionally, clients now save a string slice containing x-goog-api-client header value instead of the value by itself. This is a small optimization so that we don't create a new slice every time. * Change media body from an object to a string (#1256) Samples fail before sending a request if the media body is an object. * Fix NONE auth Go sample (#1261) * Change Node.js unit test require. (#1264) * Ruby: Allow doc gapic generation to generate tests. (#1266) * Ruby: Remove aliasing from method samples and tests (#1253) * Ruby: Fix broken baselines from aliasing fix (#1269) * Remove unused code (#1270) * Python: README overhaul. (#1263) * Ruby: Update gemspec and add useful metadata files (#1258) * Ruby: Update gemspec and add useful metadata files * Specify HTTP client when constructing client (#1275) If a HTTP client is not passed to `build`, the Google API Python client will create a default one and attempt to authenticate it. This causes failures in environments where ADC auth is not available (Travis). In any case, it's not useful to access any auth code in the mock tests. This commit removes that possibility. * Fix JSON print in Ruby (#1274) It turns out that `to_h` is not a method available on every object returned by the samples at the moment. Also, there's some kind of decoding bug showing up in certain samples where the JSON module is unable to unparse the response. It's troublesome to have so much boilerplate just to pretty print. This commit removes the pretty calls in favor of the vanilla `to_json` method implemented by the base model class in the Ruby client. In the future, once the bugs w.r.t `pretty_generate` have been resolved, we can revert. * NodeJS: Update version index to support partial veneers (#1267) * NodeJS: Updates to package.json (#1268) * Migrate import disambiguation to Python MVVM (#1243) * Fix Node package.json (#1282) * go: use time.UnixNano instead of testutil.UIDSpace (#1279) Since generated code should be testable from api-client-staging repo, we want to reduce dependency on other cloud.google.com/go packages, especially internal ones. Clients will still depend on testutil for ProjID and TokenSource. This is OK, since they can be easily reimplemented in google-client-staging repo itself. * Update Java grpc metadata for new staging structure (#1265) * PHP: share credentials with operations client (#1283) * java: move CredentialProvider up to ClientSettings (#1251) This implements the client side changes to support googleapis/gax-java#305. * NodeJS: generate readme. (#1240) * NodeJS: Small additions to the package.json (#1289) * NodeJS: Use fileheader for copyright lines. (#1293) * NodeJS: Use correct casing for partial veneers (#1295) * NodeJS: Small readme fix from GCN reviews (#1294) * go: make longrunning methods use generated longrunning client (#1288) The cloud.google.com/go/longrunning package will need to change slightly to accomodate this change. xGoogHeader is now gone from the generated longrunnging types, as the header will be automatically inserted by LROClient itself. * NodeJS: Update partial veneer surface to add api documentation. (#1296) * NodeJS: Metadata updates. (#1298) * Readme: Update readme templates to add api summaries. (#1299) * Add PHP Exception tests (#951) * Add exception tests * Remove unnecessary checks in exception tests * Process markdown cloud links for PHP (#1091) * Process markdown cloud links for PHP * Restructure comment formatting * go: return error creating LRO client instead of panicking (#1300)

* merge master to Discogapic (#1304) * Fix JSON pretty print in Ruby sample (#1254) * Ruby: README Overhaul (feat. examples) (#1245) * go: use new metadata methods (#1262) Updates googleapis/google-cloud-go#624. metadata.FromContext and metdata.NewContext are replaced by metadata.{New,From}{Incoming,Outgoing}Context. Generated unit tests now verify that x-goog-api-client header is inserted. Additionally, clients now save a string slice containing x-goog-api-client header value instead of the value by itself. This is a small optimization so that we don't create a new slice every time. * Change media body from an object to a string (#1256) Samples fail before sending a request if the media body is an object. * Fix NONE auth Go sample (#1261) * Change Node.js unit test require. (#1264) * Ruby: Allow doc gapic generation to generate tests. (#1266) * Ruby: Remove aliasing from method samples and tests (#1253) * Ruby: Fix broken baselines from aliasing fix (#1269) * Remove unused code (#1270) * Python: README overhaul. (#1263) * Ruby: Update gemspec and add useful metadata files (#1258) * Ruby: Update gemspec and add useful metadata files * Specify HTTP client when constructing client (#1275) If a HTTP client is not passed to `build`, the Google API Python client will create a default one and attempt to authenticate it. This causes failures in environments where ADC auth is not available (Travis). In any case, it's not useful to access any auth code in the mock tests. This commit removes that possibility. * Fix JSON print in Ruby (#1274) It turns out that `to_h` is not a method available on every object returned by the samples at the moment. Also, there's some kind of decoding bug showing up in certain samples where the JSON module is unable to unparse the response. It's troublesome to have so much boilerplate just to pretty print. This commit removes the pretty calls in favor of the vanilla `to_json` method implemented by the base model class in the Ruby client. In the future, once the bugs w.r.t `pretty_generate` have been resolved, we can revert. * NodeJS: Update version index to support partial veneers (#1267) * NodeJS: Updates to package.json (#1268) * Migrate import disambiguation to Python MVVM (#1243) * Fix Node package.json (#1282) * go: use time.UnixNano instead of testutil.UIDSpace (#1279) Since generated code should be testable from api-client-staging repo, we want to reduce dependency on other cloud.google.com/go packages, especially internal ones. Clients will still depend on testutil for ProjID and TokenSource. This is OK, since they can be easily reimplemented in google-client-staging repo itself. * Update Java grpc metadata for new staging structure (#1265) * PHP: share credentials with operations client (#1283) * java: move CredentialProvider up to ClientSettings (#1251) This implements the client side changes to support googleapis/gax-java#305. * NodeJS: generate readme. (#1240) * NodeJS: Small additions to the package.json (#1289) * NodeJS: Use fileheader for copyright lines. (#1293) * NodeJS: Use correct casing for partial veneers (#1295) * NodeJS: Small readme fix from GCN reviews (#1294) * go: make longrunning methods use generated longrunning client (#1288) The cloud.google.com/go/longrunning package will need to change slightly to accomodate this change. xGoogHeader is now gone from the generated longrunnging types, as the header will be automatically inserted by LROClient itself. * NodeJS: Update partial veneer surface to add api documentation. (#1296) * NodeJS: Metadata updates. (#1298) * Readme: Update readme templates to add api summaries. (#1299) * Add PHP Exception tests (#951) * Add exception tests * Remove unnecessary checks in exception tests * Process markdown cloud links for PHP (#1091) * Process markdown cloud links for PHP * Restructure comment formatting * go: return error creating LRO client instead of panicking (#1300) * fails b/c Node.empty() uses null params * one test passes * all current tests pass * tests for Node parent() * Test * removed Method.empty(): * reordering methods for convention * made Node.from(Node, path) methods package private * removed path() from Document, Schema, and Method * removed static constructors with empty parent node

shinfan requested review from michaelbausor, garrettjonesgoogle and vam-google May 12, 2017 18:16

garrettjonesgoogle reviewed May 16, 2017

View reviewed changes

shinfan force-pushed the master branch from 64e6d49 to 8a6e93a Compare May 19, 2017 17:27

Remove staging build file

58a159a

shinfan force-pushed the master branch from 8a6e93a to 58a159a Compare May 19, 2017 17:34

shinfan added 3 commits May 19, 2017 10:42

Address PR feedback

a9ab4d9

Update tests

3d2aaf2

Minor fix

7184161

shinfan merged commit 735def9 into googleapis:master May 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Java grpc metadata for new staging structure #1265

Update Java grpc metadata for new staging structure #1265

shinfan commented May 12, 2017 •

edited

Loading

codecov-io commented May 12, 2017 •

edited

Loading

michaelbausor commented May 12, 2017

shinfan commented May 12, 2017

shinfan commented May 12, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

shinfan commented May 19, 2017

garrettjonesgoogle commented May 19, 2017

Update Java grpc metadata for new staging structure #1265

Update Java grpc metadata for new staging structure #1265

Conversation

shinfan commented May 12, 2017 • edited Loading

codecov-io commented May 12, 2017 • edited Loading

Codecov Report

michaelbausor commented May 12, 2017

shinfan commented May 12, 2017

shinfan commented May 12, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

shinfan commented May 19, 2017

garrettjonesgoogle commented May 19, 2017

shinfan commented May 12, 2017 •

edited

Loading

codecov-io commented May 12, 2017 •

edited

Loading